From 7f89856b298d021b52397e89f9452512f879cae2 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Mon, 22 Feb 2016 10:54:32 +0100
Subject: [PATCH] Adwaita: color scale slider fixes

use the pointy slider on colorscales, this way it picks the
correct slider on rtl.
---
 gtk/theme/Adwaita/_common.scss           |   9 ++
 gtk/theme/Adwaita/gtk-contained-dark.css | 132 ++++++++++++++---------
 gtk/theme/Adwaita/gtk-contained.css      | 132 ++++++++++++++---------
 3 files changed, 177 insertions(+), 96 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 4b7d32c215..f280ca1ea3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2593,6 +2593,7 @@ scale {
                                  (':backdrop', '-backdrop'),
                                  (':backdrop:disabled', '-backdrop-insensitive') {
 
+          @at-root %#{$marks_infix}-#{$dir_infix},
           trough#{$nth_child} {
             slider {
               margin: 0 1px;
@@ -2626,6 +2627,14 @@ scale {
       }
     }
   }
+
+  &.color {
+    &.horizontal { trough { @extend %scale-has-marks-above-horz; }}
+    &.vertical {
+      &:dir(ltr) trough { @extend %scale-has-marks-below-vert; }
+      &:dir(rtl) trough { @extend %scale-has-marks-above-vert; }
+    }
+  }
 }
 
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d7ccbb1074..463cdc11bf 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2763,9 +2763,11 @@ scale {
         -gtk-icon-shadow: none; }
   scale marks {
     color: alpha(currentColor,0.4); }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider {
+    scale.color.horizontal trough slider,
+    trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
@@ -2773,9 +2775,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:hover {
+    scale.color.horizontal trough slider:hover,
+    trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
@@ -2783,9 +2787,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:active {
+    scale.color.horizontal trough slider:active,
+    trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
@@ -2793,9 +2799,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:disabled {
+    scale.color.horizontal trough slider:disabled,
+    trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
@@ -2803,9 +2811,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:backdrop {
+    scale.color.horizontal trough slider:backdrop,
+    trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
@@ -2813,9 +2823,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.horizontal trough slider:backdrop:disabled,
+    trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
@@ -2823,162 +2835,186 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider {
+    trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:hover {
+    trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:active {
+    trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:disabled {
+    trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:backdrop {
+    trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:backdrop:disabled {
+    trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider {
+    scale.color.vertical:dir(rtl) trough slider,
+    trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:hover {
+    scale.color.vertical:dir(rtl) trough slider:hover,
+    trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:active {
+    scale.color.vertical:dir(rtl) trough slider:active,
+    trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:disabled {
+    scale.color.vertical:dir(rtl) trough slider:disabled,
+    trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:backdrop {
+    scale.color.vertical:dir(rtl) trough slider:backdrop,
+    trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.vertical:dir(rtl) trough slider:backdrop:disabled,
+    trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider {
+    scale.color.vertical:dir(ltr) trough slider,
+    trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:hover {
+    scale.color.vertical:dir(ltr) trough slider:hover,
+    trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:active {
+    scale.color.vertical:dir(ltr) trough slider:active,
+    trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:disabled {
+    scale.color.vertical:dir(ltr) trough slider:disabled,
+    trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:backdrop {
+    scale.color.vertical:dir(ltr) trough slider:backdrop,
+    trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.vertical:dir(ltr) trough slider:backdrop:disabled,
+    trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 2a1d3793bc..969c5d79e2 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2794,9 +2794,11 @@ scale {
         -gtk-icon-shadow: none; }
   scale marks {
     color: alpha(currentColor,0.4); }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider {
+    scale.color.horizontal trough slider,
+    trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
@@ -2804,9 +2806,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:hover {
+    scale.color.horizontal trough slider:hover,
+    trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
@@ -2814,9 +2818,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:active {
+    scale.color.horizontal trough slider:active,
+    trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
@@ -2824,9 +2830,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:disabled {
+    scale.color.horizontal trough slider:disabled,
+    trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
@@ -2834,9 +2842,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:backdrop {
+    scale.color.horizontal trough slider:backdrop,
+    trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
@@ -2844,9 +2854,11 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:last-child:not(:only-child) slider {
+  scale.color.horizontal trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:last-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.horizontal trough slider:backdrop:disabled,
+    trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
@@ -2854,162 +2866,186 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider {
+    trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:hover {
+    trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:active {
+    trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:disabled {
+    trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:backdrop {
+    trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale trough:first-child:not(:only-child) slider {
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale trough:first-child:not(:only-child) slider:backdrop:disabled {
+    trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider {
+    scale.color.vertical:dir(rtl) trough slider,
+    trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:hover {
+    scale.color.vertical:dir(rtl) trough slider:hover,
+    trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:active {
+    scale.color.vertical:dir(rtl) trough slider:active,
+    trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:disabled {
+    scale.color.vertical:dir(rtl) trough slider:disabled,
+    trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:backdrop {
+    scale.color.vertical:dir(rtl) trough slider:backdrop,
+    trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:last-child:not(:only-child) slider {
+  scale.color.vertical:dir(rtl) trough slider,
+  trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.vertical:dir(rtl) trough slider:backdrop:disabled,
+    trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider {
+    scale.color.vertical:dir(ltr) trough slider,
+    trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:hover {
+    scale.color.vertical:dir(ltr) trough slider:hover,
+    trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:active {
+    scale.color.vertical:dir(ltr) trough slider:active,
+    trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:disabled {
+    scale.color.vertical:dir(ltr) trough slider:disabled,
+    trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:backdrop {
+    scale.color.vertical:dir(ltr) trough slider:backdrop,
+    trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
-  scale.vertical trough:first-child:not(:only-child) slider {
+  scale.color.vertical:dir(ltr) trough slider,
+  trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
-    scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
+    scale.color.vertical:dir(ltr) trough slider:backdrop:disabled,
+    trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
       background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
-- 
2.30.2